Adapted tests to new WmsAggregationService and fixed bugs in implementation