more testinput2 support