Cleaning up the mess that is deposits controller/tests
More cleanup... >:l
merge