Split up tests into buffered and unbuffered and add more unbuffered tests