Added Server files and tests