cleaning code
Improve running tests in windows. Add TODO