Replace other tests with testng