Improved waits in test_clock_switch_clock_type. Fixes issue #486