Review fix and test update.