Cleanup registry test images

Implement issue #27