Clean up test framework some