image controller test fixes