merge test server extpoll into test server