implement remaining tests and javadoc