Refactored shoulds out of tests