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

This reverts commit 8c74d7cfa0dd07c9d15f1ecb19a2fb553ef97acf.
Revert "Aggregations: Adds ability to sort on multiple criteria"

This reverts commit 384c67cd2f41b9a3983988f66516a20989254ed0.