Updating to make tests pass