Test refactoring for issue #192

I added an extra commit with a few javadocs.