[RTR] Fixing some TODOs

[EveCharbie]

This change is 

[codecov]

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 77.69%. Comparing base (c194ef1) to head (bbc656f).
Report is 199 commits behind head on master.

Additional details and impacted files

@@            Coverage Diff             @@
##           master     #922      +/-   ##
==========================================
- Coverage   77.70%   77.69%   -0.01%     
==========================================
  Files         156      156              
  Lines       18011    18005       -6     
==========================================
- Hits        13995    13989       -6     
  Misses       4016     4016              

Flag	Coverage Δ
unittests	77.69% <100.00%> (-0.01%)	⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

• ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

[EveCharbie]

@Ipuch could you review this please ? :)

[Ipuch]

Reviewed 1 of 1 files at r1, all commit messages.
Reviewable status: complete! all files reviewed, all discussions resolved (waiting on @EveCharbie)