Crossplatform tests

Changes to make tests working on average windows machine