repaired some unit tests, added new unit tests, skipped some broken unit tests