Remove new demo records, corrects some tests