EDIT

cleanup and renaming some functional test classes (cont. II)

cleanup and renaming some functional test classes (cont.)

cleanup and renaming some functional test classes

Revert "rename getMediainHierarchy to getMediaInHierarchy"

This reverts commit 10a9a8cd7811b77de3d877298448c650a3e117e4.

rename getMediainHierarchy to getMediaInHierarchy

update Datasource script

rename static AggregationMode methods

minor

cleanup

cleanup