Make bundle R/W: improvement + unit tests