First attempt to fix the problem with failing tests.