Rename files back to helpers
Change returns of functions to login type instances. Modify tests to adapt to this change.
Validate session and yield block if necessary function.