add server and tests