FIX: Faster tests