Added lots of tests, added reordering for smartdiff. Write on the report.
added todo