Added logos
Renamed with the test_ prefix
Apply a mapping helper
Merge branch 'development'