New Test Base + Tunnel code + removed old heper functions