Cleanup rename-service tests

[#68475822]