Rework: Remove outdated TODOs and some other stuff from the tests