Fix tests for servlet 3.1