[+JL] Update the unit tests to use properly the mocking framework.