FIXED server, added tests