Minor updates to fix violations in jcl-types. Also migrated to TestNG from JUnit.