cs fix
update NavigationFactory and add test