match_server and test fixes as per @lvh review comments