FIX: Quieter testing, better png