Refactoring dataspace integration tests #551