Slightly faster to import object as single object in array
Don't bother another lookup - minor optimization during import
Fix test semantics. I'm an idiot