[CB|LL] -- fixed breaking registration tests