Changed a weird iterator loop to a classic indexed one

Signed-off-by: Ondrej Skopek <skopekondrej@gmail.com>
Finished FileSaveBatchTest