remove Tuple dependency in test utils