Moved to the new wiring. Removed all setTimeout in the persistance tests