Fix test characterisation for windows.
Fix broken help handling under windows.