Editing tests based on feedback.
Finished editing tests based on first round feedback.