Moving last tests to TestNG and removing JUnit for now.