Fix solution and add test images