back to rectangular, row-wise storing
updated the unit tests