Simplify TestAutoVariables test cases