Fix tests failing on Windows

Change-Id: Id656eb1fba9cc52ee88bbc0adc24da48134d5d6a