Adding t4x and wxx + tests