Renamed test, changed strings, cleaned up code
Fixed strings
Merged develop and suggest
Moved receiver to strings
Merge branch 'suggest' into develop