Fix the tests

with the least amount of change.

Guys: We have a configuration problem that needs to be solved...