Fixed registry unit tests