modified for test and result data collection