Upgraded shoulda-context gem