[FIX] Unit tests fix and little corrections on typehint