Review fixes
Fixed tests