refactored review tests