multiple review fix and test