rm Test.java and fixed a few bugs