Extended tests to cover re-attaching entities