Updated test framework.