Catalogs should always use subtree=True
_unit should return None if value is None
Fixed failing tests since changing to subtree=True in analysis.py