Finished changing test methods over to Shoulda