Extend and fix the grading for causality tests.