Updating tests, fixing mutation errors.