FIX all unit test ok
FIX unit tests and test harness