Fix issue #130 and JUnit/Javadoc improvements

Can we shorten or eliminate this timeout?