Further splitting up tests'