Fix iface getter from previous commit

And fix unit tests