Refactor to a multiple JUnit files to individual tests