Fix failed tests

@alexeyvo , you can refactor this unit to try to use https://bucket.convey.com/Convey/dunitgroup-dunit/blob/development/convey-src/uCnvDunitUtilities.pas