Adding some number tests, and clean up some others, and add some TODOs