More tweaks to testng setup.