Merge "Add unit tests to check for CONF getattr during import"