Move to testng for testing