Updates to tests

Chris Dartrequested to merge
issue/image_to_media_swapper-3535835:1.0.x into 1.0.x

Add and update tests for the new features.

Merge request reports