04-handout created, some tests extended