Re-Add Unit tests for Linux
Unit test for Windows