Refactor for multiple images
More test images; more flexible about PNG name