Update tests to new Tuple mapping API