Removed checking of interfaces in the methods which ensure cardinality.
Added a new (now failing, so commented-out) test which nails down the cardinality issue which is still around.