Remove test methods, add javadoc