Make desktop_local tests include desktoopRouter so we can start fixing them