Updated for integration-tests