Added test images and fixed bugs