fix tests, add more change line variations