Update project, make tests pass