SWITCHING TEST FIX.