fixed images and fixed tests