Enhancement of the test framework.