Clean up existing tests
Added support for Pair and Triple classes