Fix up the tests for [GH-13]