Optim: Don't wait full timeout for CompanionServer if it's done Tests now run 2.5s instead of 12s. Tests: Ran all tests multiple times - all green