Better constructor for specifying image versions to cut up
simplified test class
Simplifying code base