Added unit and integration tests.

557u, 6i