Added some TODOs for more testing options