New structure for the verification.
New tests.