fix tuple parsing, and these tests look awful but they work and test things