adapted tests

I adapted the tests for the last changes. Some explanations :