Fixing WF 3.0 Test cases