BAC-239: ImageServing code cleanup
ImageServingUnitTest: solve class names conflict
BAC-239: ImageServingHelper cleanup

* return indexed images when helper methods are called
* remove unused method