Made the web tests a bit more robust