updated for use of shoulda matchers
updated for shoulda matchers
Merge branch 'feature/shoulda-tests' into develop
Merge branch 'release/RELEASE'