Fix more tests: properly set legacy provider in User, etc

blah