Attempt to unbreak move semantics tests