Fix expectations and split out buffer size tests