Fix tests - all pass but auth retry test is extremely slow