Partial change in consistency check and additional related tests.