make inline token matching ungreedy
update tests