Fix Buffer issues in tests with versions 0.8 and 1.1