Array and Hash collection value fix and specs