Readded support for integration testing with new entity structure and service organisation