Refactor test framework for better verification

Code review was done in master with change-id:
I9f05df85f1becd95283d4b1db6dd6bc3345a12f1

Change-Id: Iba6ef7d3df5de99277727652436baab836448b97
16 files changed