tests running faster, refactored transports