Restored all service tests
Merge branch 'master'