Review fixes: using errors.Annotate(f), table based tests. Bug 1309207