Also, it would be great to see updates in the unit tests to cover this.