Dynamic mode now creates events on demand
Updated tests for dynamic mode