Update old tests to take CMake generator options into account.

Authored by ouwerkerk on Jan 3 2020, 9:23 PM.