sync code with undertow test & fix setup.py