Allow overlapping instances from module imports, fix tests