Restored path, working again
Interval for ES
No reset between tests
Moving stuff around