If we have some time, could we maybe add per-question tests?