fixing test cases after the design change