FIX: Better program coverage