Merge pull request #172 from NamelessCoder/tests

[FEATURE] More test cases for Provider and Service