Tests changed to reflect changes.