Test & migrate the remaining old samples