More server parsing, some test tools