Working on a better test suite
Massive testing overhaul
Added a todo