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