Remove testNG dependencies (part 2)