Clean up preference code in UA tests
4 files changed