Merge "Removed non-testing suggestions"