CBQE-1260: fixes to template import and support run_test