Fixed accounting for data consumed. Data consumption now tested.