add server; rename selfTest