Fix and add tests for windows drive

Fixes test and adds an additional test for c826639abc298b87dd8d6086c73d52193da07c5b which was part of PR #321