Moving some test cases around
Cleaning list of TODOs