Flatten the tests a bit