Merge "Make some test_list_projects tests work w/ pre-prov"