Improved test framework.