References #1803: Fixed integration tests