More tests, fix buffer length.