Parent Service/Stub and Test
Refactored