Test mode added