PLAT-5915 - Enhance ServiceContext and fix test failues