Improve test_generation_strategy file

[mgarrard]

Summary: While I was working on adding some new tests I noticed we could be using the vars defined in setup much more in the file to reduce redundancy

Differential Revision: D56744357