test framework improvements