cleanup, javadocs
test package