Minor organization changes
Suggestion Order Tests Passing