test_switching_table improvements