Refactor suggestions to utils, use regex, add tests