Fixes some test failures when aggregates are turned on. Some agg exclusions were missing.