Working on consistency tests