Modified to get integration tests passing