Made Server tests working