Updated tests per Rog feedback.