Fixed MainTest.java to use singleton