do we need a suggestion factory now that there is no Suggestion class? Or did you just change this to allow existing tests to pass?