Add consistency tests