Reorganised images tests
Merge pull request #751 from kaedroho/images-tests-reorg-2

Reorganised images tests