Further prep for easy test vs. real switching