Update more tests, fix intermittent failure