etcdserver: cleanup server tests

for #1342