Fix now the tests