Edits to make tests pass