bug 1005488 - deprecate content/content, test cleanup

our tests never clean prefs after themselves