Clean up TestResolvingTrait