fix uniqueness of registrations with __COUNTER__ and rebuild tests.