Updates from review. Reran tests