Get unit tests passing for `server` and `test`