Added ConsistencyTest. Fix discriminator values that had changed.