Override non-context direct import, fix tests