Review fix and setup tests
Review fixes