Some of the unit tests fixed and can be run by unit test runner