Crystal tests pass. Re #6199