add more tests, fix missing registrations