Move some tests around. Fix some windows issues.