Bug 936505 - Neaten up test_settings_wallpaper