Bug Fix for TestNG