OZP-664: Streamlined Kernel : Added JUnit Tests