Remove tests that duplicate tests elsewhere
Better naming for test class
Convert to a data-driven TestNG test
TestNG-style asserts