buffer shim fixes and full tests