[JENKINS-17067] Split up tests