refactor utility registration

one more test
recall todos