FIx Test problem
Merge branch 'master' of https://github.com/EdgeComputing/cats
Resolved CIT-190
Merge branch 'master' of https://github.com/EdgeComputing/cats