Added some TODOs and removed unused assert.sh
Thinned down tests/asserts