Added shoulda and some more specs