Revise review model and tests to cover all attributes.
Merge branch 'master' into review_dev