PLAT-5915 - Enhance ServiceContext

 - add extra test