BS-7436, fix rename on tests