Refactored windows integration tests