Cleanup; Remove Duplicated Implementation; Refactor (HUB)
Change Test Referance issue
Merge branch 'master' of https://github.com/EdgeComputing/cats.git