Fixed throughput test and cleaned up Wheel usage