updated to TestNG and other minor stuff