Validity - Improve (Tests were modified due to changes in implementation).