Convert test to TB4 to be compatible with Tomcat proxy test

Change-Id: Iab049f9036c1e2efcd1445cd7691a93af1210ff0