Starting to move all magic variables into contained test case configs