Unit test updates + ensure auth retry only done once per execute