Temporarily fix some user tests.