fix image viewer to handle images in subdirectories, add to test