Fix a few parsing issues and add multi server support to tester