Commit changes to add DI and Mock for Service