adjust variable tests some more