One more test and one simplification.