Fixing WF test cases