Fix/Re-enable broken tests from 8d0487

This re-enables coverage some basic undefined var tests that were previously
flakey (fixed via this CL and via d0ad6c5).