add server + tests