Merge "Make use of TAPL in quickswitch tests" into tm-dev