Fix test
Add tuple support to testing tools