General cleanup

Removed integration tests from unit test classes. Improved comments to
use more standard JavaDoc HTML. Minor code changes.