rearanging testcases for maven