Added module tests
Windows issue with global singleton