tests and slight supporting changes to server constructor