[#1251] Fix failing tests.