Refactor serviced locations test to avoid code duplication. Refactor serviced method to make sure it serves even services from subassemblies