Corrected unit and integration tests.