Expanded/renewed testing capabilities