Clean up whitespace
Add test
Add support for tuples
Add support for tuples to client