interoperability unit test cleanup