Merge "Add APIs for improved MTS testing"