Added server test
added an edit
Fixed merge conflicts