Fix intent tests, update for preference.xml, and consider null attrResourceLoader to be an empty one