Merge "Fix out of bounds access in test."