Test review fixes
Implementation fixes
test fixes