Fixed some tests and javadoc comments