slight test reorg, could use more later
main image now extracted from entries and used as a cluster's image, closes #20