Improve testing controls