Merge changes I5d28c2f5,Ib00b036f

* changes:
  Remove redundant function and calls
  Add test for partial inverse transforms