use Id instead of name, remove map
begin reading
add tests