Changed type inputdata in general method and test class
Merged dv-impl fixed conflict