Renames test.java to AGE.java and cleans code up