refactored base converter
refactored test datasource config