Fix these tests, they will never succeed the way we set these variables using the old test. Fixes #1987