added other TObjects to type replacement
conversion
tests are more comprehensive