Simplify extended unit test framework.