Fix some silly mistakes the tests didn't catch

![](http://www.channelweb.co.uk/IMG/255/254255/ronseal-man-270x167.jpg?1364475710)

Quick fix. Actual server tests incoming.