Fixes the failing tests