This deserves unit tests - let's add to spec/unit