Fix wrong imports in macos and windows

Add some testing