Fix integration tests (#1973)

By updating the expected changes and working around an identified bug.

Author: rickie