Use shoulda
Add tests.
Merge branch 'b2-test'