JAL-4107 patching tests after merge