fix rename; fix new dataset test