Another attempt to unbreak move semantics tests