added some more tests
more tests
clang formated
resolve server.c merge
re clang formatted