Revert "Revert "Add support to create mocks for each repository""

This reverts commit 36470cecdb788914e237edf84653998da1a7f291.
Revert "Revert "minor issue fixed""

This reverts commit 7ac7cd50d0e31a7b15de20173342b7428fdf83e5.
versions + minor cleanup