Reorganization for facilitate create unit_test (classic definition, in isolation from other unit tests)