Try to fix spurious test failures

Tests sometimes fail due to various issues. Would be nice to harden them up if possible. Some failure reasons:

- [ ] No network access
- [ ] Creating/removing remote branches