Flesh out the tests for this branch a bit more
(#520)