Fix failing tests (permanant fix)