IFCW

Fix some failed unit tests from #1307 (actually, the PR's number is very good :) )
Ah yes, I haven;t updated this since it was expected to 2.2 when I coded it.

Thanks.