Add checkmode testing