@OnesAndTwos: Refactored helpers and added another test