Adds supervisor review feature
Fixes test issues