Moved some of the variable setup from "make check" into the