Renaming expected images for future proofing and moving to multi image tests