Revert changes (mainly naming) for  test_relationships_fields