PumpTest: update tests
Fun: Add and rework Tuple Comparators