am 16088967: Merge "Fix all backwards (-1 == x) tests."

* commit '16088967bccc9e86d77c3eff4efc20426fe1ed46':
  Fix all backwards (-1 == x) tests.