More test fixes, move job message defines to winnt.h