Unit tests knife cloud (OC-8425...8428)

Branch contains unit tests for pbis: OC-8425....OC-8428.

*note: This contains changes pulled from "kaustubh-OC-8312-gemskeleton"