+ Unit tests added for new service implementations
+ Minor code enhancements
Refs: #18569