Test mode fix