Altered service patterns and added test file