Revert "New Image Testing"

This reverts commit 1f919ff3507efc257788e8e285d2b72c2e06ceaf.