Changed testsuite to work with tuples