Repaired unit tests