Minor test framework cleanup