Adjust tests for WF.
Upgrade javax.servlet.