Fixes for running tests in Windows, added Tree