Actually I think I'll just merge it with TestBulkUserAPI.  I had initially planned on having a separate test for the ES stuff, but now it's only used in one place