Fix tests that fail with new interface import api