* Add unit-tests for registry * Tweaks to registry unit-tests * Remove duplicate unit-test * Remove duplicate test case