Merge "Move testInvariantInCanBeSatisfiedBy to be its own test"