Added code to generate newContain atLeastOneOf tests for Option, and changed Aggregation.scala to pass the tests.