Add average() test
GeneratorImpl: Fix intersection() visibility