JavaDoc and unit test cleanup