[test] improvements to testing framework