test refactoring

Refactoring of tests,
Corrections in Data type conversion