Clean up test_helper
Use devise test helpers instead of rolling our own stuff