So... we added one more test case and moved some stuff out of the test
module.