JAL-2885 tests updated for code changes