Updated tests
Added first version of result aggregator