bug 1012361 - simple-prefs test cleanup
Merge pull request #1492 from zombie/1012361-sp-test-clean

bug 1012361 - simple-prefs test cleanup, r=test-only