Change to use testNG