Move about half of the integration tests over to the new testtools framework