Added Unit Tests, More Server Parsing

YAY