Add tests, rewrite tests with expect syntax, use shoulda matchers