Moved tests to new folder
Updates old state during event loop
Corrected us to delay count macro