CLOUDIFY-1944 adjust integration phase3 test and main test to relationship changes