single router instance + testz
Merge branch 'dev'