Windows tests

Windows tests were successful, merging