Cleanup the simplification branch and add tests generation