added shoulda and new tests