Temporarily fix some user tests.
tweaks