Removing errors that cannot happen
Adding forgottent tests