fix or clean up some TODOs that are outdated or simply not that useful
improve test