Use aggregationService, fix test recipe in Makefile

Use the aggregationService rather than own method for getting next item
and instead of the max filter. Fix test recipe.