removed test.java
Some more improvements