Cleanup image handling in tests #3995

Probably needs to be extracted into its own service like recently done for users and entities.
Just so it can be used elsewhere instead of the current trait-based system.
Probably needs a cleanup of the methods also.