Addressed some CR feedback.
Added test.