More fixes to zinc analysis testing.