removed test class, added Server class