Updated for integration tests