am 510303e7: am d65dc64c: am 50ab028a: am 8a92e112: Refactor test framework for better verification

* commit '510303e7536e67e855430656440cfaf54969bcf9':
  Refactor test framework for better verification