Enhance the unit test codes