Rearrange test buttons