Small refectoring of TSPWrapperTest.