Finalize work to run api server in process for tests