reorder tests to fix race condition