first commit, some consistency tests implemented