Fix some bugs which causes many unit tests failures
Fix a small bug
Fix more bugs, all unit tests passed (14 modules failed before fixing)