Squash commits around integration tests into one.