Also, refactor tests such that we're not deleting users or prefs