Fix some TODOs in tests