Improved assertion messages for integration tests.

Plus fixes for botched previous commit.