Tests and updates per comments.