Corrected incorrect field being used and added a test to prevent it next
update.