This is for backward compatibility.

Also add some explicit tests for check_consistency, it was missing in
the first place.