Reorganize of tests
Beginning of refactor of envelope_functions to be provided with a provider as opposed to creating it, itself.
Begining of bringing to parity