added test file
added test files
added test files, fixed merge conflict
Fixes typo in the server
merge
merge