TST rebase fix