cleanup, move pairtest to independent file