04-annotation-config handout finished, tests modified