repaired unittests