tweaks to test order and timing