Fixes failing tests.