restructure radcheck test