Merge "ensure setup_test_user has been called before using test_user"