TEST: Re-adjust for test branch