simplify Tuple and add more tests