Clean up instantiations in tests