fixing test case issues