Use helpers

Given this discovery/verification, the __each test added is no longer necessary and should be removed.