add more checking of the testing element
Merge pull request #1354 from lzhan/next

add more checking of the testing elements