Optimizations to WirEx test tool