Tests

Merge pull request #677 from mojighahar/patch-1 #256

Job	Run time
test-windows (windows-amd64-unit-test-4-cpu)	35m 32s
coverage	41m 14s
	1h 16m 46s

Provide feedback