Add unit test. Cloned feature update.