Improve testing infrastructure