make Bufferable collections safer
fix for real
clean up a bit
Merge pull request #150 from johnynek/bufferable-tests

make Bufferable collections safer