Fixed unit and integration testing.