Update and rename test.java to GeneratorTest.java