GitLab

Merge branch 'dev-jvb-712' into 'master'

fix: Update tests to hit coverage metric, fix bugs found in the process

See merge request !48