Fix data races in state/apiserver tests
Merge pull request #47 from axw/apiserver-test-race

Fix data races in state/apiserver tests