Add review tests
Fix issues with review requests
Use consistent naming scheme