Started changing tests over to shoulda-context