Refactor: removed notion of aggregators from core classes
Major refactoring and adjustments to get QueryParserTests