Small improvement of the unit tests