Adding unit tests for the registry. Fixing some uri issues. Removing dependency to consumer to break circular dependency