Fix mockserver, remove cruft, and fix a few tests