JAL-1782 refactored test to ensure it passes in TestNG