tidy breadcrumb and add tests for registry