Adding tests, updating server to work with ring clients