updated tests and bufio definition