Changed phrasing, fixed and added a test.