Fixing test cases after last change