improve default routing & update tests