Removed Test::Unit; added some testing helpers
Removed test
Updating controllers
Merged rspec branch