Change to BaseTest for Images