Bug Fix for test Cases.