update ClassFinder to work with windows
update unit Test