Added Test mode