Switched test-support to test_support after several hours of painful debugging.