Return current account instance rather then just the current account id

Here we go, I think testing needs to be cleaned up a bit and expanded on to use actual ActiveRecord objects or even a stripped down Rails test project. Creating a test for this by mocking the object will soon defeat the purpose of testing?

Thoughts?