Improved and added integration tests.

557u, 11/12i