jtong - change test for v2, change output and input style