Fix up to pass nose
Fix server slightly, test coverage