Completed 10.5.4. Unfortunately it seems I have a series of tests using the users factory that cause collisions.