Handful of eleventh hour fixes for TEST_FOREVER