Fix broken tests.
Fix broken javadoc