Clean up FeedbackQuestionsLogic #1931

Fixes Issue #1931 
Add tests to increase coverage in FeedbackQuestionsLogic