Fixed a few sonar issues. Translated @todos. WIP #TEST-423 & #TEST-422.