Some amendments in the tests.