Enhance the unit test