whole bunch of changes to get one test to work (with auth turned off)