Fix bug 23488
Add test for grouping with collations
Mark a test as dependent on HOF feature
Mark map tests as dependent on XP31/XQ31
Fix a serialization test that was passing for the wrong reasons