Cosmetic changes to Test.java and Train.java