Update tests for my changes, and address comments from review.