Add path checks for .exe versions as well
Do different tests based on OS