FIX: Fix tests on windows, remove dep for tests