dvk/type_conversion_cleanup_and_tests

Handle more type conversion cases, add tests