Some improvements, add test images