reorder client test to try to avoid race condition