Committing server and test files

nice formatting tool