Isolate code changes to resolve service. Create tests for bug fix