Refactored small part of suggest functional tests