Some tests and adding shoulda