FIX failing test harness
FIX broken unit tests