Fix TODO tests by removing code, the best type of development!