Fixed the unit test bugs