Tweak smaller things

* Remove srv prefix for now
* consistently use want/got in testing