IFCW

Fix some failed unit tests from #1307 (actually, the PR's number is very good :) )
Alright.
The reason I use result (as a general term) is so that I can copy and paste it to another unit test without losing the meaning. But, probably, more specific is better.

Thanks.