delete test, and more javadoc