Revert "[TEST] added @AwaitsFix to failing StringTermsTests while I work on a fix"

This reverts commit 18a713a2ae896e72c5821bf3f6d239ce634d1f52.
Revert "Aggregations: Adds ability to sort on multiple criteria"

This reverts commit bfedd11ffa4c48be0afd91793f491b0a8ff0ef8d.