Passed (finally) our Make Suggestion tests.  Will clean up at a future time.