Updates from review.
Update tests.