Re-arrange test directories