Fix broken tests (buffer modifications)