Added TestNG support