[UPDATE] Fix router, test simple module