FIX: Fix test order