Reviewer Matt: Check IFCs for multiple RegistrationTypes

Matt,

Please can you review my fix to issue #466?

I've included a couple of UTs too.

Thanks,
Graeme