Refactored Ref and Snapshot to NormalizedRef and NormalizedSnapshot
Fixed bug in stubNormalRef