Refactored makeSuggestion test a little bit