Renaming TestNG client file and cleaned unsed codes in client