Work with the latest changes to web-platform-tests and wptserve