Fixed parse-tuples and added tests