Only set the wallpaper in teardown if we captured the default
Merge pull request #406 from zacc/wallpaper_test_tweak

Only set the wallpaper in teardown if we captured the default