Added TestNG capabilities to existent tests