Changes to Crystal tests. Re #6199