Reorganize tests; Add TODO