Tests: ConsistencyTests minor fixes