Add test case for images and some minor enhancements