Fixes the tests