Re-order test to fix timing issues