Improve wording and add test