Test mode should be optional (as mentioned before)