Squashed some serious bugs. Cycle and Test count looking really accurate now.