Minor Fixups and add tests

See merge request !447
3 jobs for master
in 0 seconds, using 0 compute credits, and was queued for 1 second