Moved the test harness from tap to tape & faucet.