Tweak vim adaptor and tests to fix 0th buffer errors