Add TODOs to test functions, continue later zzz...