CLOUDIFY-1944 fixed tests
Merge branch 'CLOUDIFY-1944-working' into feature/CLOUDIFY-1944-relationships
Merge remote-tracking branch 'origin/feature/CLOUDIFY-1944-relationships' into feature/CLOUDIFY-1944-relationships