WIP: Create re-usable test-harness for images