ConsistencyTests fixing