Some refactoring of the unit tests
Missing file