IFCW

Fix some failed unit tests from #1307 (actually, the PR's number is very good :) )
I'm a bit worried about some of these tests that they may break unnecessarily when a new IF is added. Maybe rather than `assertItemsEqual` maybe `assertIn` over the range of functions we currently have is more appropriate?