Add more consistency tests