Remove special-purpose code from test framework