remove named return values on Average
put everything in _test scope