Refactored review processing and tests

Part of bug 1317554

Change-Id: I8edfd326e016b98a376e3a803ea70d7a8fe06812