Switch from Junit to TestNG
Update tests for TestNG
Update tests for TestNG