Revert "Fixing WF 3.0 Test cases"

This reverts commit 92ae734a91f7c242d34b84697d62f3519057c7d4.