Some general changes to test framework and shared test code
This will create a new commit in order to revert the existing changes.
