fix non-nt tests