Use helpers

Which existing unit test covered this corner case? All of them were passing with this changeset.