Fix alot of stuff from Server and implement basic testing