Makefile changed for windows + tst dep added.
Swapped unittest content fixed.