Repaired unit tests.