Upgraded test framework.