Moved tests to new unit area and mocked aggregators.
Merge pull request #1 from esc24/move_tests_for_marqh

Moved tests to new unit area and mocked aggregators.