added some stuff to test.java
merged with tbarker