Some cleanup
fix tests
Merge remote-tracking branch 'vicb/server'