Fix tests for non-fast-forward errors