Added TEST mode