fix new config problems, tests all pass again

The tests pass but there's still a "NIF upgrade" error reported at the end
of each test run. Will fix later.