many changes

corrections of type conversion class
renaming of datasources
improvements of tests