Refactor tests with real images to avoid exceptions in metadaservice
fixed conflicts