Added some additional fixing around tests and added stub replacement DataConverter