Repaired the unit tests