Images tests reorg