Updated TODO
Fixed incorrect column order
* Bug fixes
* Rely more on the inbuilt verification functions for testing
* Fixed all the tests