Changes from review, tests not fixed yet