Added more testing to Test.java, fixed bugs found that way.