Minor changes to test based on feedback.