Add wrappers to constructor arguments. Tested.
Fix tests errors.