Fix test and sample type change