Cleanup handling of ICC profile, more extensive testing