using indexes instead of server ids makes test deterministic
added constants to identify servers, for readability
Merge pull request #1684 from lassewesth/pushstrategytestfix

using indexes instead of server ids makes test deterministic