Bug fixes for the Tuple test cases.