Add unit test + implementation of this feature.