Review feedback
Fixing test failures