image format support and test cleanup.