Fixed web datasources. Now the tests pass.