Try once more to fix the NPE on tests.