split up tests more