Added more modes to teset