Merge "Fix unit tests to detect import failures"