Rename test image
Add some utility functions