Fixing up user tests.