I'd say leave as-is for now, but we should probably open a discussion on more thorough tests and a reusable implementation for this functionality.