more structure and event testing