Improved testing and data collection