Improve testing functionality.