Add tests and capture ability around logging, bring CapturingServer back into Server