Explicitly add Buffer in tests