change the last few ADD_TEST to use new syntax, that supports generator expressions