GH-1 Code cleanup: moved to JUnit 4 annotations and removed some legacy HTML attributes