clean up tests a bit

user Shoulda matchers in models &c.
Merge branch 'master' of github.com:patbl/ea-skillshare