More fixes to tests

Tried to fix timeout issues as well as some other test issues.