Few minor changes to cpu test