Update: consolidating CompanionServerTests logic Now that patterns are relatively clear we can simplify logic. This'll make adding the remaining 19 tests faster/easier. Tests: ran new tests