Use "path-based-router" (use to be "amd-router") and cleanup of tests