Separate tests into smaller chunks