more rspec tests (including controller tests)
Merge pull request #28 from JasonLev/master

more rspec tests (including controller tests) + fixes to controller