Fix import tests by adopting new Controls/Directive interface.