Windows compile fixes
Windows Link fixes
Fix/improve test