Merge pull request #823 from ajdawson/fix-aggregator-tests

Fixed failing Aggregator tests on master.
Added unit tests for rolling_window function.