Remove unused method and depending test
Revert "Remove unused method and depending test"

This reverts commit 81b06aa318bf877963b963d9b8579fb929dd41d3.
Remove unused method and non working test class.