Split tests into smaller more manageable chunks