Clarified interaction between singleton test variables and filters as well as permutations and filters. Also some trivial name changing.