split up the tests more