Update import paths
Update test progs for go13
Ensure we lock OS thread in test