Also added relevant specs and refactored to_references in a bunch of places to be more consistent.