Mayor no longer set to testify in schools rezoning trial