Split the tests up a little