Fixed more javadocs; Removed unnecessary tests

Converted a number of unit tests to use JUnit assertions, rather than
the java assertion mechanism, which is often not active during unit
tests (depending on settings).