finish update. tests passing again now with little changes