Clean up javadoc / Add test tag