add more checking before testing page
format change
Merge pull request #1348 from lzhan/next

add more checking before testing page