Updating usage event processing and tests