test fixes for imgy-2
Revert "test fixes for imgy-2"

This reverts commit 7340adc1d2879e48a576e9e76509d90946f4b18c.