Removing unnecessary timeouts to fix error due to event queue order, Changing the location at which the delta is reset, and fixing tests