Added Server class and a test for it