sone changes and tests for batch conversion